gnome-shell.in: Drop TFP checks

These were only necessary for DRI1, and we just aren't going to
work well there anyways.

https://bugzilla.gnome.org/show_bug.cgi?id=642084

diff --git a/src/gnome-shell.in b/src/gnome-shell.in
index a187588d435f1bf19df0fdaab85b1a9df5303427..28938ffb582d94a8656370e819bd4982dda178a5 100755 (executable)
--- a/src/gnome-shell.in
+++ b/src/gnome-shell.in
@@ -142,25 +142,6 @@ def start_dconf_await_service():
 
     loop.run()
 
-GLXINFO_RE = re.compile(r"^(\S.*):\s*\n((?:^\s+.*\n)*)", re.MULTILINE)
-
-def _get_glx_extensions():
-    """Return a tuple of server, client, and effective GLX extensions"""
-
-    glxinfo = subprocess.Popen(["glxinfo"], stdout=subprocess.PIPE)
-    glxinfo_output = glxinfo.communicate()[0]
-    glxinfo.wait()
-
-    glxinfo_map = {}
-    for m in GLXINFO_RE.finditer(glxinfo_output):
-        glxinfo_map[m.group(1)] = m.group(2)
-
-    server_glx_extensions = set(re.split("\s*,\s*", glxinfo_map['server glx extensions'].strip()))
-    client_glx_extensions = set(re.split("\s*,\s*", glxinfo_map['client glx extensions'].strip()))
-    glx_extensions = set(re.split("\s*,\s*", glxinfo_map['GLX extensions'].strip()))
-
-    return (server_glx_extensions, client_glx_extensions, glx_extensions)
-
 def start_shell(perf_output=None):
     bin_dir = os.path.dirname(os.path.abspath(sys.argv[0]))
     if os.path.exists(os.path.join(bin_dir, 'gnome-shell.in')):
@@ -231,24 +212,6 @@ def start_shell(perf_output=None):
         # things that are explicitly logged via log() from javascript
         env['GJS_DEBUG_TOPICS'] = 'JS ERROR;JS LOG'
 
-    if use_tfp:
-        # Decide if we need to set LIBGL_ALWAYS_INDIRECT=1 to get the
-        # texture_from_pixmap extension; we take having the extension
-        # be supported on both the client and server but not in the
-        # list of effective extensions as a signal of needing to force
-        # indirect rendering.
-        (server_glx_extensions, client_glx_extensions, glx_extensions) = _get_glx_extensions()
-
-        if ("GLX_EXT_texture_from_pixmap" in server_glx_extensions and
-            "GLX_EXT_texture_from_pixmap" in client_glx_extensions and
-            (not "GLX_EXT_texture_from_pixmap" in glx_extensions)):
-            if options.verbose:
-                print "Forcing indirect GL"
-            # This is Mesa specific; the NVIDIA proprietary drivers
-            # drivers use __GL_FORCE_INDIRECT=1 instead. But we don't
-            # need to force indirect rendering for NVIDIA.
-            env['LIBGL_ALWAYS_INDIRECT'] = '1'
-
     if options.perf is not None:
         env['SHELL_PERF_MODULE'] = options.perf
 
@@ -598,11 +561,6 @@ if options.debug_command:
 elif options.debug:
     options.debug_command = "gdb --args"
 
-# Figure out whether or not to use GL_EXT_texture_from_pixmap.
-# FIXME: Move this to ClutterGlxPixmap like
-# CLUTTER_PIXMAP_TEXTURE_RECTANGLE=disable.
-use_tfp = os.environ.get('GNOME_SHELL_DISABLE_TFP', '') != ''
-
 # We only respawn the previous environment on abnormal exit;
 # for a clean exit, we assume that gnome-shell was replaced with
 # something else.